(find-file-read-args): Don't trash existing value of

`minibuffer-setup-hook', just add our hook to it.

diff --git a/lisp/files.el b/lisp/files.el
index 2feadc8c1215c3a803269d00c54111d73ebd3bc0..9169ae9193bb61c14cccaecf7ec5552c9807aa22 100644 (file)
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -773,12 +773,15 @@ documentation for additional customization information."
   (list (let ((find-file-default
               (and buffer-file-name
                    (abbreviate-file-name buffer-file-name)))
+             (munge-default-fun
+              (lambda ()
+                (setq minibuffer-default find-file-default)
+                ;; Clear out this hook so it does not interfere
+                ;; with any recursive minibuffer usage.
+                (pop minibuffer-setup-hook)))
              (minibuffer-setup-hook
-              '((lambda ()
-                  (setq minibuffer-default find-file-default)
-                  ;; Clear out this hook so it does not interfere
-                  ;; with any recursive minibuffer usage.
-                  (setq minibuffer-setup-hook nil)))))
+              minibuffer-setup-hook))
+         (add-hook 'minibuffer-setup-hook munge-default-fun)
          (read-file-name prompt nil default-directory))
        current-prefix-arg))